Skip to content

Fix MergeBlock error: a merge block for another header#3280

Merged
MrSidims merged 2 commits intoKhronosGroup:mainfrom
CHIP-SPV:MergeBlock
Jan 12, 2026
Merged

Fix MergeBlock error: a merge block for another header#3280
MrSidims merged 2 commits intoKhronosGroup:mainfrom
CHIP-SPV:MergeBlock

Conversation

@pvelesko
Copy link
Copy Markdown
Contributor

@pvelesko pvelesko commented Jul 25, 2025 •
edited
Loading

Code was assigning the same merge block to multiple headers. Added a fails as follows before the fix:

[3/4] Running the LLVM-SPIRV regression tests
llvm-lit: /space/pvelesko/.local/lib/python3.10/site-packages/lit/llvm/config.py:502: note: using clang: /space/pvelesko/install/llvm/21.0-upstream/bin/clang
FAIL: LLVM_SPIRV :: OpLoopMerge_mergeBlock.ll (1 of 918)
******************** TEST 'LLVM_SPIRV :: OpLoopMerge_mergeBlock.ll' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
RUN: at line 5: /space/pvelesko/SPIRV-LLVM-Translator/build/tools/llvm-spirv/llvm-spirv /space/pvelesko/SPIRV-LLVM-Translator/test/../mergeBlock.bc -o /space/pvelesko/SPIRV-LLVM-Translator/build/test/test_output/Output/OpLoopMerge_mergeBlock.ll.tmp.spv
+ /space/pvelesko/SPIRV-LLVM-Translator/build/tools/llvm-spirv/llvm-spirv /space/pvelesko/SPIRV-LLVM-Translator/test/../mergeBlock.bc -o /space/pvelesko/SPIRV-LLVM-Translator/build/test/test_output/Output/OpLoopMerge_mergeBlock.ll.tmp.spv
RUN: at line 6: /usr/local/bin/spirv-val /space/pvelesko/SPIRV-LLVM-Translator/build/test/test_output/Output/OpLoopMerge_mergeBlock.ll.tmp.spv
+ /usr/local/bin/spirv-val /space/pvelesko/SPIRV-LLVM-Translator/build/test/test_output/Output/OpLoopMerge_mergeBlock.ll.tmp.spv
error: line 111: Block '46[%_Z11round_robiniiiPViS0__exit_loopexit]' is already a merge block for another header
  %_Z15gpu_round_robiniiiPViS0_ = OpFunction %void None %32

#3277 should be merged first as this test will trigger that error before hitting merge block error.

@MrSidims MrSidims requested review from MrSidims and svenvh October 16, 2025 07:48
@MrSidims MrSidims mentioned this pull request Oct 16, 2025
Open
maarquitos14
maarquitos14 reviewed Oct 16, 2025
View reviewed changes
YixingZhang007
YixingZhang007 reviewed Oct 16, 2025
View reviewed changes
YuriPlyakhin
YuriPlyakhin reviewed Oct 16, 2025
View reviewed changes
@pvelesko pvelesko force-pushed the MergeBlock branch 2 times, most recently from ec57cf7 to 5a7e488 Compare December 15, 2025 05:01
@pvelesko
Copy link
Copy Markdown
Contributor Author

pvelesko commented Dec 15, 2025

Unit test failures:

[100%] Linking CXX executable ../../../../bin/llvm-spirv
/usr/bin/ld: final link failed: No space left on device

@MrSidims
Copy link
Copy Markdown
Contributor

MrSidims commented Dec 15, 2025

/usr/bin/ld: final link failed: No space left on device

Working on this

@pvelesko
Copy link
Copy Markdown
Contributor Author

pvelesko commented Jan 6, 2026

@MrSidims

Any ETA on fixing the CI?
Any more comments/TODOs for me in regards to this PR?

@MrSidims
Copy link
Copy Markdown
Contributor

MrSidims commented Jan 6, 2026 •
edited
Loading

@pvelesko thanks for the ping

UPD: below test failure is expected
Main concerning failures is:
error: line 44: OpLoopMerge must immediately precede either an OpBranch or OpBranchConditional instruction.
OpLoopMerge must be the second-to-last instruction in its block.
OpLoopMerge %latch_loopexit %inner DontUnroll

I believe it's related to the patch and should be addressed before merge

debug info test failures is fixed, need to update the HEAD of the PR
gather/scatter test should be passing now, as package in apt.llvm.org is up to date
in-tree debug build failure in the process

@pvelesko
Copy link
Copy Markdown
Contributor Author

pvelesko commented Jan 6, 2026

rebased @MrSidims

@pvelesko
Copy link
Copy Markdown
Contributor Author

pvelesko commented Jan 7, 2026

@MrSidims rebased on main now that Loop Merge is in.

@pvelesko
Copy link
Copy Markdown
Contributor Author

pvelesko commented Jan 12, 2026

@MrSidims please merge if ok. Thank you.

@MrSidims
Copy link
Copy Markdown
Contributor

MrSidims commented Jan 12, 2026

@pvelesko thanks for the fix!

@MrSidims MrSidims merged commit 9e823ad into KhronosGroup:main Jan 12, 2026
10 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@maarquitos14 maarquitos14 maarquitos14 left review comments

@YixingZhang007 YixingZhang007 YixingZhang007 left review comments

@YuriPlyakhin YuriPlyakhin YuriPlyakhin approved these changes

@MrSidims MrSidims MrSidims approved these changes

@svenvh svenvh Awaiting requested review from svenvh

@vmaksimo vmaksimo Awaiting requested review from vmaksimo

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@pvelesko @MrSidims @YuriPlyakhin @maarquitos14 @YixingZhang007